Rename the profiler option

We don't support any profilers other than sysprof,
so name the option accordingly. While we are at it,
change it to a meson feature option, so
-Dprofiler=true becomes -Dsysprof=enabled

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c03e3cfcdc61c8dc2b40ad4ec997efccb9ae2e5..391c3aacdc24cb2f9010a55549656944f632da35 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,7 @@ fedora-x86_64:
   script:
     - meson subprojects update
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-            -Dprofiler=true
+            -Dsysprof=enabled
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11

diff --git a/meson.build b/meson.build
index bf8d515bbbeebd6c0d975565889352500c7f7bce..7d3f083a9dcacc134595d51d6736a40157c3aab4 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -701,7 +701,7 @@ if cloudproviders_enabled
   endif
 endif
 
-profiler_enabled = get_option('profiler')
+profiler_enabled = get_option('sysprof').enabled()
 if profiler_enabled
   # libsysprof-capture support
   libsysprof_capture_dep = dependency('sysprof-capture-4',
@@ -891,7 +891,7 @@ summary('Print backends', print_backends)
 summary('Media backends', media_backends)
 summary('Vulkan support', have_vulkan)
 summary('Cloud support', get_option('cloudproviders'))
-summary('Profiler', get_option('profiler'))
+summary('Sysprof support', get_option('sysprof').enabled())
 summary('Colord support', get_option('colord'))
 
 # Build

diff --git a/meson_options.txt b/meson_options.txt
index f73f966d601d12ee2fd42dfeb1a44c332aad3e2b..5eb0a6087ed07ac0760e0a9c0f7c4891308bfabe 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -23,8 +23,12 @@ option('xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto
   description : 'Enable support for the Xinerama extension')
 option('cloudproviders', type: 'boolean', value: false,
   description : 'Enable the cloudproviders support')
-option('profiler', type: 'boolean', value: false,
-  description : 'Enable profiler support')
+
+option('sysprof',
+       type: 'feature',
+       value: 'disabled',
+       description : 'include tracing support for sysprof')
+
 option('tracker3', type: 'boolean', value: false,
   description : 'Enable Tracker3 filechooser search')